Fix life cycle to avoid crash. [#536966]

2008-06-20  Jody Goldberg <jody@gnome.org>

	* gtk/gtkprintoperation-win32.c (gtk_print_run_page_setup_dialog) :
	  Fix life cycle to avoid crash. [#536966]

svn path=/trunk/; revision=20660

diff --git a/ChangeLog b/ChangeLog
index 3e592b4713fa1239bb838aaecb9ba2c9ef175b1f..fa34c435bda93367a58a781bcf9faa0ad2f839b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-20  Jody Goldberg <jody@gnome.org>
+
+       * gtk/gtkprintoperation-win32.c (gtk_print_run_page_setup_dialog) : 
+         Fix life cycle to avoid crash. [#536966]
+
 2008-06-20  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkmenuitem.c gtk/gtkmessagedialog.c gtk/gtkplug.c : must return

diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 53732980f49ad0d60aabfdc9a7e6f8fb8c8b0014..d306a8ad630d88c5137a4796de941bb308b70b0c 100644 (file)
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -1867,9 +1867,6 @@ gtk_print_run_page_setup_dialog (GtkWindow        *parent,
        devmode_to_settings (settings, pagesetupdlg->hDevMode);
     }
   
-  if (free_settings)
-    g_object_unref (settings);
-
   if (res)
     {
       gtk_page_setup_set_orientation (page_setup, 
@@ -1906,6 +1903,9 @@ gtk_print_run_page_setup_dialog (GtkWindow        *parent,
                                        unit);
     }
   
+  if (free_settings)
+    g_object_unref (settings);
+
   return page_setup;
 }